From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 14:17:54 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a896e4c89e06e92a53317c72b2863b84bb585d4d;p=emacs.git

merge from trunk
---

a896e4c89e06e92a53317c72b2863b84bb585d4d